Adwaita: notebook fixes

make the tab close button a tad bigger, use header 'paddings' in
place of 'tabs' margins for spacing.

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 33070ec275c3bce56d84f2b5e44a166eb58f8b87..fb8d3e63db01da097f4f071909e4e0db41b4b87c 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1938,11 +1938,11 @@ notebook {
         &, &:backdrop { color: gtkalpha(currentColor, 0.3); }
 
         padding: 0;
-        margin-top: 8px;
-        margin-bottom: 8px;
+        margin-top: 4px;
+        margin-bottom: 4px;
         // FIXME: generalize .small-button?
-        min-width: 18px;
-        min-height: 18px;
+        min-width: 20px;
+        min-height: 20px;
 
         &:last-child {
           margin-left: 4px;
@@ -1958,10 +1958,10 @@ notebook {
 
     &.top,
     &.bottom {
-      tabs {
-        margin-left: 4px;
-        margin-right: 4px;
+      padding-left: 4px;
+      padding-right: 4px;
 
+      tabs {
         tab {
           margin-left: 4px;
           margin-right: 4px;
@@ -1973,10 +1973,10 @@ notebook {
 
     &.left,
     &.right {
-      tabs {
-        margin-top: 4px;
-        margin-bottom: 4px;
+      padding-top: 4px;
+      padding-bottom: 4px;
 
+      tabs {
         tab {
           margin-top: 4px;
           margin-bottom: 4px;

diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 85450bd2bf3875cfb18d22dc031ff13bfac60f60..5a426c2aaabfaced3afd9d94cb43266f8c212d1a 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -2248,10 +2248,10 @@ notebook > header {
     notebook > header tab .titlebar button.titlebutton,
     .titlebar notebook > header tab button.titlebutton {
       padding: 0;
-      margin-top: 8px;
-      margin-bottom: 8px;
-      min-width: 18px;
-      min-height: 18px; }
+      margin-top: 4px;
+      margin-bottom: 4px;
+      min-width: 20px;
+      min-height: 20px; }
       notebook > header tab button.flat:hover, notebook > header tab notebook > header > tabs > arrow:hover, notebook > header tab button.sidebar-button:hover, notebook > header tab headerbar button.titlebutton:hover, headerbar notebook > header tab button.titlebutton:hover,
       notebook > header tab .titlebar button.titlebutton:hover,
       .titlebar notebook > header tab button.titlebutton:hover {
@@ -2272,17 +2272,17 @@ notebook > header {
       .titlebar notebook > header tab button.titlebutton:first-child {
         margin-left: -4px;
         margin-right: 4px; }
-  notebook > header.top tabs, notebook > header.bottom tabs {
-    margin-left: 4px;
-    margin-right: 4px; }
+  notebook > header.top, notebook > header.bottom {
+    padding-left: 4px;
+    padding-right: 4px; }
     notebook > header.top tabs tab, notebook > header.bottom tabs tab {
       margin-left: 4px;
       margin-right: 4px; }
       notebook > header.top tabs tab.reorderable-page, notebook > header.bottom tabs tab.reorderable-page {
         border-style: none solid; }
-  notebook > header.left tabs, notebook > header.right tabs {
-    margin-top: 4px;
-    margin-bottom: 4px; }
+  notebook > header.left, notebook > header.right {
+    padding-top: 4px;
+    padding-bottom: 4px; }
     notebook > header.left tabs tab, notebook > header.right tabs tab {
       margin-top: 4px;
       margin-bottom: 4px; }

diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 57493cdeb1b6c3b10c6eb77c4b4b2e7617ee149e..16c41bb7773f45b5129c206ad284d3832671ffdb 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -2258,10 +2258,10 @@ notebook > header {
     notebook > header tab .titlebar button.titlebutton,
     .titlebar notebook > header tab button.titlebutton {
       padding: 0;
-      margin-top: 8px;
-      margin-bottom: 8px;
-      min-width: 18px;
-      min-height: 18px; }
+      margin-top: 4px;
+      margin-bottom: 4px;
+      min-width: 20px;
+      min-height: 20px; }
       notebook > header tab button.flat:hover, notebook > header tab notebook > header > tabs > arrow:hover, notebook > header tab button.sidebar-button:hover, notebook > header tab headerbar button.titlebutton:hover, headerbar notebook > header tab button.titlebutton:hover,
       notebook > header tab .titlebar button.titlebutton:hover,
       .titlebar notebook > header tab button.titlebutton:hover {
@@ -2282,17 +2282,17 @@ notebook > header {
       .titlebar notebook > header tab button.titlebutton:first-child {
         margin-left: -4px;
         margin-right: 4px; }
-  notebook > header.top tabs, notebook > header.bottom tabs {
-    margin-left: 4px;
-    margin-right: 4px; }
+  notebook > header.top, notebook > header.bottom {
+    padding-left: 4px;
+    padding-right: 4px; }
     notebook > header.top tabs tab, notebook > header.bottom tabs tab {
       margin-left: 4px;
       margin-right: 4px; }
       notebook > header.top tabs tab.reorderable-page, notebook > header.bottom tabs tab.reorderable-page {
         border-style: none solid; }
-  notebook > header.left tabs, notebook > header.right tabs {
-    margin-top: 4px;
-    margin-bottom: 4px; }
+  notebook > header.left, notebook > header.right {
+    padding-top: 4px;
+    padding-bottom: 4px; }
     notebook > header.left tabs tab, notebook > header.right tabs tab {
       margin-top: 4px;
       margin-bottom: 4px; }